ci: Bump Fedora base image

F31 is EOL and no longer satisfies our ATK dependency. Bump it to
F35 to get gtk3's CI into a working state again.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5f80f104ec85921e4bb6be05330a8b32d1457af6..966491993346c087f19fedb34fefc5a9f54c6928 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,13 @@ cache:
     - _ccache/
 
 fedora-autotools:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker-autotools.sh
 
 fedora-distcheck:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35
   variables:
     DO_DISTCHECK: "yes"
   when: manual
@@ -22,7 +22,7 @@ fedora-distcheck:
     - bash -x ./.gitlab-ci/test-docker-autotools.sh
 
 fedora-meson:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35
   stage: build
   variables:
     EXTRA_MESON_FLAGS: "-Ddefault_library=both"
@@ -50,7 +50,7 @@ debian-meson:
       - "_build/testsuite/reftests/output"
 
 reference:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v1
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora-gtk3:v35
   stage: docs
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=release -Dgtk_doc=true -Dman=true"

diff --git a/.gitlab-ci/fedora-gtk3.Dockerfile b/.gitlab-ci/fedora-gtk3.Dockerfile
index 29e65ccf06ef543f1fbc3fb7b77dc067dc63c4fe..d93b0802d830a33757cfabdf5fd6d68d67a3d488 100644 (file)
--- a/.gitlab-ci/fedora-gtk3.Dockerfile
+++ b/.gitlab-ci/fedora-gtk3.Dockerfile
@@ -1,4 +1,4 @@
-FROM fedora:31
+FROM fedora:35
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -44,7 +44,7 @@ RUN dnf -y install \
     libXtst-devel \
     make \
     mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
+    'pkgconfig(wayland-egl)' \
     meson \
     ninja-build \
     pango-devel \